From 367f6be33cfd9e6c91410c7d60ce0c0c7c44723f Mon Sep 17 00:00:00 2001 From: Zhenzhong Duan Date: Wed, 19 Sep 2012 17:38:47 +0200 Subject: [PATCH] tmem: bump pool version to 1 to fix restore issue when tmem enabled Restore fails when tmem is enabled both in hypervisor and guest. This is due to spec version mismatch when restoring a pool. Signed-off-by: Zhenzhong Duan Acked-by: Dan Magenheimer Committed-by: Jan Beulich --- xen/common/tmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index f4812b911c..ed322b68de 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2397,7 +2397,8 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, break; rc = (pool->persistent ? TMEM_POOL_PERSIST : 0) | (pool->shared ? TMEM_POOL_SHARED : 0) | - (pool->pageshift << TMEM_POOL_PAGESIZE_SHIFT); + (pool->pageshift << TMEM_POOL_PAGESIZE_SHIFT) | + (TMEM_SPEC_VERSION << TMEM_POOL_VERSION_SHIFT); break; case TMEMC_SAVE_GET_POOL_NPAGES: if ( pool == NULL ) -- 2.30.2